Autogenerated HTML docs for v1.7.3.2-161-g3089c
diff --git a/git-diff-index.html b/git-diff-index.html index 1b0e663..9f11c78 100644 --- a/git-diff-index.html +++ b/git-diff-index.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-diff-index(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-diff-index(1)</title> </head> <body> <div id="header"> @@ -318,13 +412,13 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git diff-index</em> [-m] [--cached] [<common diff options>] <tree-ish> [<path>…]</p></div> +<div class="paragraph"><p><em>git diff-index</em> [-m] [--cached] [<common diff options>] <tree-ish> [<path>…]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Compares the content and mode of the blobs found via a tree +<div class="paragraph"><p>Compares the content and mode of the blobs found via a tree object with the content of the current index and, optionally ignoring the stat state of the file on disk. When paths are specified, compares only those named paths. Otherwise all @@ -332,14 +426,14 @@ </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -p </dt> -<dt> +<dt class="hdlist1"> -u </dt> -<dt> +<dt class="hdlist1"> --patch </dt> <dd> @@ -348,10 +442,10 @@ </p> </dd> -<dt> +<dt class="hdlist1"> -U<n> </dt> -<dt> +<dt class="hdlist1"> --unified=<n> </dt> <dd> @@ -361,7 +455,7 @@ Implies <tt>-p</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> --raw </dt> <dd> @@ -370,7 +464,7 @@ This is the default. </p> </dd> -<dt> +<dt class="hdlist1"> --patch-with-raw </dt> <dd> @@ -378,7 +472,7 @@ Synonym for <tt>-p --raw</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> --patience </dt> <dd> @@ -386,7 +480,7 @@ Generate a diff using the "patience diff" algorithm. </p> </dd> -<dt> +<dt class="hdlist1"> --stat[=<width>[,<name-width>]] </dt> <dd> @@ -397,7 +491,7 @@ giving another width to it separated by a comma. </p> </dd> -<dt> +<dt class="hdlist1"> --numstat </dt> <dd> @@ -409,7 +503,7 @@ <tt>0 0</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> --shortstat </dt> <dd> @@ -419,7 +513,7 @@ lines. </p> </dd> -<dt> +<dt class="hdlist1"> --dirstat[=<limit>] </dt> <dd> @@ -431,7 +525,7 @@ counted for the parent directory, unless <tt>--cumulative</tt> is used. </p> </dd> -<dt> +<dt class="hdlist1"> --dirstat-by-file[=<limit>] </dt> <dd> @@ -439,7 +533,7 @@ Same as <tt>--dirstat</tt>, but counts changed files instead of lines. </p> </dd> -<dt> +<dt class="hdlist1"> --summary </dt> <dd> @@ -448,7 +542,7 @@ such as creations, renames and mode changes. </p> </dd> -<dt> +<dt class="hdlist1"> --patch-with-stat </dt> <dd> @@ -456,7 +550,7 @@ Synonym for <tt>-p --stat</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> -z </dt> <dd> @@ -464,12 +558,12 @@ When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been given, do not munge pathnames and use NULs as output field terminators. </p> -<div class="para"><p>Without this option, each pathname output will have TAB, LF, double quotes, +<div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes, and backslash characters replaced with <tt>\t</tt>, <tt>\n</tt>, <tt>\"</tt>, and <tt>\\</tt>, respectively, and the pathname will be enclosed in double quotes if any of those replacements occurred.</p></div> </dd> -<dt> +<dt class="hdlist1"> --name-only </dt> <dd> @@ -477,7 +571,7 @@ Show only names of changed files. </p> </dd> -<dt> +<dt class="hdlist1"> --name-status </dt> <dd> @@ -486,7 +580,7 @@ of the <tt>--diff-filter</tt> option on what the status letters mean. </p> </dd> -<dt> +<dt class="hdlist1"> --submodule[=<format>] </dt> <dd> @@ -498,7 +592,7 @@ option of <a href="git-submodule.html">git-submodule(1)</a> does. </p> </dd> -<dt> +<dt class="hdlist1"> --color[=<when>] </dt> <dd> @@ -507,7 +601,7 @@ The value must be always (the default), never, or auto. </p> </dd> -<dt> +<dt class="hdlist1"> --no-color </dt> <dd> @@ -517,7 +611,7 @@ Same as <tt>--color=never</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> --word-diff[=<mode>] </dt> <dd> @@ -527,8 +621,8 @@ <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and must be one of: </p> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> color </dt> <dd> @@ -536,30 +630,30 @@ Highlight changed words using only colors. Implies <tt>--color</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> plain </dt> <dd> <p> - Show words as <tt>[-removed-]</tt> and <tt>{+added+}</tt>. Makes no + Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous. </p> </dd> -<dt> +<dt class="hdlist1"> porcelain </dt> <dd> <p> Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the - usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/<tt> </tt> + usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` ` character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde <tt>~</tt> on a line of its own. </p> </dd> -<dt> +<dt class="hdlist1"> none </dt> <dd> @@ -568,10 +662,10 @@ </p> </dd> </dl></div> -<div class="para"><p>Note that despite the name of the first mode, color is used to +<div class="paragraph"><p>Note that despite the name of the first mode, color is used to highlight the changed parts in all modes if enabled.</p></div> </dd> -<dt> +<dt class="hdlist1"> --word-diff-regex=<regex> </dt> <dd> @@ -580,19 +674,19 @@ runs of non-whitespace to be a word. Also implies <tt>--word-diff</tt> unless it was already enabled. </p> -<div class="para"><p>Every non-overlapping match of the +<div class="paragraph"><p>Every non-overlapping match of the <regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append <tt>|[^[:space:]]</tt> to your regular expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline.</p></div> -<div class="para"><p>The regex can also be set via a diff driver or configuration option, see +<div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly overrides any diff driver or configuration setting. Diff drivers override configuration settings.</p></div> </dd> -<dt> +<dt class="hdlist1"> --color-words[=<regex>] </dt> <dd> @@ -601,7 +695,7 @@ specified) <tt>--word-diff-regex=<regex></tt>. </p> </dd> -<dt> +<dt class="hdlist1"> --no-renames </dt> <dd> @@ -610,7 +704,7 @@ file gives the default to do so. </p> </dd> -<dt> +<dt class="hdlist1"> --check </dt> <dd> @@ -621,7 +715,7 @@ --exit-code. </p> </dd> -<dt> +<dt class="hdlist1"> --full-index </dt> <dd> @@ -631,7 +725,7 @@ line when generating patch format output. </p> </dd> -<dt> +<dt class="hdlist1"> --binary </dt> <dd> @@ -640,7 +734,7 @@ can be applied with <tt>git-apply</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> --abbrev[=<n>] </dt> <dd> @@ -653,10 +747,10 @@ digits can be specified with <tt>--abbrev=<n></tt>. </p> </dd> -<dt> +<dt class="hdlist1"> -B[<n>][/<m>] </dt> -<dt> +<dt class="hdlist1"> --break-rewrites[=[<n>][/<m>]] </dt> <dd> @@ -664,7 +758,7 @@ Break complete rewrite changes into pairs of delete and create. This serves two purposes: </p> -<div class="para"><p>It affects the way a change that amounts to a total rewrite of a file +<div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of @@ -673,18 +767,18 @@ original should remain in the result for git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines).</p></div> -<div class="para"><p>When used with -M, a totally-rewritten file is also considered as the +<div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number <tt>n</tt> controls this aspect of the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with -addition and deletion compared to 20% or more of the file's size are +addition and deletion compared to 20% or more of the file’s size are eligible for being picked up as a possible source of a rename to another file.</p></div> </dd> -<dt> +<dt class="hdlist1"> -M[<n>] </dt> -<dt> +<dt class="hdlist1"> --detect-renames[=<n>] </dt> <dd> @@ -692,15 +786,15 @@ Detect renames. If <tt>n</tt> is specified, it is a is a threshold on the similarity index (i.e. amount of addition/deletions compared to the - file's size). For example, <tt>-M90%</tt> means git should consider a + file’s size). For example, <tt>-M90%</tt> means git should consider a delete/add pair to be a rename if more than 90% of the file - hasn't changed. + hasn’t changed. </p> </dd> -<dt> +<dt class="hdlist1"> -C[<n>] </dt> -<dt> +<dt class="hdlist1"> --detect-copies[=<n>] </dt> <dd> @@ -709,7 +803,7 @@ If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>. </p> </dd> -<dt> +<dt class="hdlist1"> --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]] </dt> <dd> @@ -726,7 +820,7 @@ that matches other criteria, nothing is selected. </p> </dd> -<dt> +<dt class="hdlist1"> --find-copies-harder </dt> <dd> @@ -740,7 +834,7 @@ <tt>-C</tt> option has the same effect. </p> </dd> -<dt> +<dt class="hdlist1"> -l<num> </dt> <dd> @@ -752,7 +846,7 @@ number. </p> </dd> -<dt> +<dt class="hdlist1"> -S<string> </dt> <dd> @@ -763,7 +857,7 @@ <a href="gitdiffcore.html">gitdiffcore(7)</a> for more details. </p> </dd> -<dt> +<dt class="hdlist1"> -G<regex> </dt> <dd> @@ -772,7 +866,7 @@ the given <regex>. </p> </dd> -<dt> +<dt class="hdlist1"> --pickaxe-all </dt> <dd> @@ -782,7 +876,7 @@ in <string>. </p> </dd> -<dt> +<dt class="hdlist1"> --pickaxe-regex </dt> <dd> @@ -791,7 +885,7 @@ regex to match. </p> </dd> -<dt> +<dt class="hdlist1"> -O<orderfile> </dt> <dd> @@ -800,7 +894,7 @@ <orderfile>, which has one shell glob pattern per line. </p> </dd> -<dt> +<dt class="hdlist1"> -R </dt> <dd> @@ -809,7 +903,7 @@ on-disk file to tree contents. </p> </dd> -<dt> +<dt class="hdlist1"> --relative[=<path>] </dt> <dd> @@ -822,10 +916,10 @@ to by giving a <path> as an argument. </p> </dd> -<dt> +<dt class="hdlist1"> -a </dt> -<dt> +<dt class="hdlist1"> --text </dt> <dd> @@ -833,7 +927,7 @@ Treat all files as text. </p> </dd> -<dt> +<dt class="hdlist1"> --ignore-space-at-eol </dt> <dd> @@ -841,10 +935,10 @@ Ignore changes in whitespace at EOL. </p> </dd> -<dt> +<dt class="hdlist1"> -b </dt> -<dt> +<dt class="hdlist1"> --ignore-space-change </dt> <dd> @@ -854,10 +948,10 @@ more whitespace characters to be equivalent. </p> </dd> -<dt> +<dt class="hdlist1"> -w </dt> -<dt> +<dt class="hdlist1"> --ignore-all-space </dt> <dd> @@ -867,7 +961,7 @@ line has none. </p> </dd> -<dt> +<dt class="hdlist1"> --inter-hunk-context=<lines> </dt> <dd> @@ -876,7 +970,7 @@ of lines, thereby fusing hunks that are close to each other. </p> </dd> -<dt> +<dt class="hdlist1"> --exit-code </dt> <dd> @@ -886,7 +980,7 @@ 0 means no differences. </p> </dd> -<dt> +<dt class="hdlist1"> --quiet </dt> <dd> @@ -894,7 +988,7 @@ Disable all output of the program. Implies <tt>--exit-code</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> --ext-diff </dt> <dd> @@ -904,7 +998,7 @@ to use this option with <a href="git-log.html">git-log(1)</a> and friends. </p> </dd> -<dt> +<dt class="hdlist1"> --no-ext-diff </dt> <dd> @@ -912,7 +1006,7 @@ Disallow external diff drivers. </p> </dd> -<dt> +<dt class="hdlist1"> --ignore-submodules[=<when>] </dt> <dd> @@ -930,7 +1024,7 @@ the behavior until 1.7.0). Using "all" hides all changes to submodules. </p> </dd> -<dt> +<dt class="hdlist1"> --src-prefix=<prefix> </dt> <dd> @@ -938,7 +1032,7 @@ Show the given source prefix instead of "a/". </p> </dd> -<dt> +<dt class="hdlist1"> --dst-prefix=<prefix> </dt> <dd> @@ -946,7 +1040,7 @@ Show the given destination prefix instead of "b/". </p> </dd> -<dt> +<dt class="hdlist1"> --no-prefix </dt> <dd> @@ -955,10 +1049,10 @@ </p> </dd> </dl></div> -<div class="para"><p>For more detailed explanation on these common options, see also +<div class="paragraph"><p>For more detailed explanation on these common options, see also <a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tree-ish> </dt> <dd> @@ -966,7 +1060,7 @@ The id of a tree object to diff against. </p> </dd> -<dt> +<dt class="hdlist1"> --cached </dt> <dd> @@ -974,7 +1068,7 @@ do not consider the on-disk file at all </p> </dd> -<dt> +<dt class="hdlist1"> -m </dt> <dd> @@ -989,12 +1083,12 @@ </div> <h2 id="_raw_output_format">Raw output format</h2> <div class="sectionbody"> -<div class="para"><p>The raw output format from "git-diff-index", "git-diff-tree", +<div class="paragraph"><p>The raw output format from "git-diff-index", "git-diff-tree", "git-diff-files" and "git diff --raw" are very similar.</p></div> -<div class="para"><p>These commands all compare two sets of things; what is +<div class="paragraph"><p>These commands all compare two sets of things; what is compared differs:</p></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> git-diff-index <tree-ish> </dt> <dd> @@ -1002,7 +1096,7 @@ compares the <tree-ish> and the files on the filesystem. </p> </dd> -<dt> +<dt class="hdlist1"> git-diff-index --cached <tree-ish> </dt> <dd> @@ -1010,7 +1104,7 @@ compares the <tree-ish> and the index. </p> </dd> -<dt> +<dt class="hdlist1"> git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…] </dt> <dd> @@ -1018,7 +1112,7 @@ compares the trees named by the two arguments. </p> </dd> -<dt> +<dt class="hdlist1"> git-diff-files [<pattern>…] </dt> <dd> @@ -1027,10 +1121,10 @@ </p> </dd> </dl></div> -<div class="para"><p>The "git-diff-tree" command begins its output by printing the hash of +<div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of what is being compared. After that, all the commands print one output line per changed file.</p></div> -<div class="para"><p>An output line is formatted this way:</p></div> +<div class="paragraph"><p>An output line is formatted this way:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0 @@ -1040,8 +1134,8 @@ delete :100644 000000 1234567... 0000000... D file5 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre> </div></div> -<div class="para"><p>That is, from the left to the right:</p></div> -<div class="olist"><ol> +<div class="paragraph"><p>That is, from the left to the right:</p></div> +<div class="olist arabic"><ol class="arabic"> <li> <p> a colon. @@ -1118,8 +1212,8 @@ </p> </li> </ol></div> -<div class="para"><p>Possible status letters are:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>Possible status letters are:</p></div> +<div class="ulist"><ul> <li> <p> A: addition of a file @@ -1162,27 +1256,27 @@ </p> </li> </ul></div> -<div class="para"><p>Status letters C and R are always followed by a score (denoting the +<div class="paragraph"><p>Status letters C and R are always followed by a score (denoting the percentage of similarity between the source and target of the move or copy), and are the only ones to be so.</p></div> -<div class="para"><p><sha1> is shown as all 0's if a file is new on the filesystem +<div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem and it is out of sync with the index.</p></div> -<div class="para"><p>Example:</p></div> +<div class="paragraph"><p>Example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre> </div></div> -<div class="para"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters +<div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.</p></div> </div> <h2 id="_diff_format_for_merges">diff format for merges</h2> <div class="sectionbody"> -<div class="para"><p>"git-diff-tree", "git-diff-files" and "git-diff --raw" +<div class="paragraph"><p>"git-diff-tree", "git-diff-files" and "git-diff --raw" can take <em>-c</em> or <em>--cc</em> option to generate diff output also for merge commits. The output differs from the format described above in the following way:</p></div> -<div class="olist"><ol> +<div class="olist arabic"><ol class="arabic"> <li> <p> there is a colon for each parent @@ -1209,25 +1303,25 @@ </p> </li> </ol></div> -<div class="para"><p>Example:</p></div> +<div class="paragraph"><p>Example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre> </div></div> -<div class="para"><p>Note that <em>combined diff</em> lists only files which were modified from +<div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from all parents.</p></div> </div> <h2 id="_generating_patches_with_p">Generating patches with -p</h2> <div class="sectionbody"> -<div class="para"><p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run +<div class="paragraph"><p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run with a <em>-p</em> option, "git diff" without the <em>--raw</em> option, or "git log" with the "-p" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div> -<div class="para"><p>What the -p option produces is slightly different from the traditional +<div class="paragraph"><p>What the -p option produces is slightly different from the traditional diff format:</p></div> -<div class="olist"><ol> +<div class="olist arabic"><ol class="arabic"> <li> <p> It is preceded with a "git diff" header that looks like this: @@ -1236,10 +1330,10 @@ <div class="content"> <pre><tt>diff --git a/file1 b/file2</tt></pre> </div></div> -<div class="para"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is +<div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, -<tt>/dev/null</tt> is _not_ used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div> -<div class="para"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the +<tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div> +<div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively.</p></div> </li> @@ -1261,16 +1355,16 @@ dissimilarity index <number> index <hash>..<hash> <mode></tt></pre> </div></div> -<div class="para"><p>File modes are printed as 6-digit octal numbers including the file type +<div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type and file permission bits.</p></div> -<div class="para"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div> -<div class="para"><p>The similarity index is the percentage of unchanged lines, and +<div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div> +<div class="paragraph"><p>The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one.</p></div> -<div class="para"><p>The index line includes the SHA-1 checksum before and after the change. +<div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode.</p></div> </li> @@ -1303,7 +1397,7 @@ </div> <h2 id="_combined_diff_format">combined diff format</h2> <div class="sectionbody"> -<div class="para"><p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or +<div class="paragraph"><p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or <em>--cc</em> option to produce <em>combined diff</em>. For showing a merge commit with "git log -p", this is the default format; you can force showing full diff with the <em>-m</em> option. @@ -1338,7 +1432,7 @@ initialized = 1; for_each_ref(get_name);</tt></pre> </div></div> -<div class="olist"><ol> +<div class="olist arabic"><ol class="arabic"> <li> <p> It is preceded with a "git diff" header, that looks like @@ -1348,7 +1442,7 @@ <div class="content"> <pre><tt>diff --combined file</tt></pre> </div></div> -<div class="para"><p>or like this (when <em>--cc</em> option is used):</p></div> +<div class="paragraph"><p>or like this (when <em>--cc</em> option is used):</p></div> <div class="literalblock"> <div class="content"> <pre><tt>diff --cc file</tt></pre> @@ -1366,7 +1460,7 @@ new file mode <mode> deleted file mode <mode>,<mode></tt></pre> </div></div> -<div class="para"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of +<div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two @@ -1381,7 +1475,7 @@ <pre><tt>--- a/file +++ b/file</tt></pre> </div></div> -<div class="para"><p>Similar to two-line header for traditional <em>unified</em> diff +<div class="paragraph"><p>Similar to two-line header for traditional <em>unified</em> diff format, <tt>/dev/null</tt> is used to signal created or deleted files.</p></div> </li> @@ -1397,29 +1491,28 @@ <div class="content"> <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre> </div></div> -<div class="para"><p>There are (number of parents + 1) <tt>@</tt> characters in the chunk +<div class="paragraph"><p>There are (number of parents + 1) <tt>@</tt> characters in the chunk header for combined diff format.</p></div> </li> </ol></div> -<div class="para"><p>Unlike the traditional <em>unified</em> diff format, which shows two -files A and B with a single column that has <tt>-</tt> (minus — -appears in A but removed in B), <tt>+</tt> (plus — missing in A but -added to B), or <tt>" "</tt> (space — unchanged) prefix, this format +<div class="paragraph"><p>Unlike the traditional <em>unified</em> diff format, which shows two +files A and B with a single column that has <tt>-</tt> (minus — appears in A but removed in B), <tt>+</tt> (plus — missing in A but +added to B), or <tt>" "</tt> (space — unchanged) prefix, this format compares two or more files file1, file2,… with one file X, and shows how X differs from each of fileN. One column for each of -fileN is prepended to the output line to note how X's line is +fileN is prepended to the output line to note how X’s line is different from it.</p></div> -<div class="para"><p>A <tt>-</tt> character in the column N means that the line appears in +<div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in fileN but it does not appear in the result. A <tt>+</tt> character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent).</p></div> -<div class="para"><p>In the above example output, the function signature was changed +<div class="paragraph"><p>In the above example output, the function signature was changed from both files (hence two <tt>-</tt> removals from both file1 and file2, plus <tt>++</tt> to mean one line that was added does not appear in either file1 nor file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div> -<div class="para"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a +<div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by <tt>git diff-files -c</tt>, it compares the two unresolved merge parents with the working tree file @@ -1428,11 +1521,11 @@ </div> <h2 id="_other_diff_formats">other diff formats</h2> <div class="sectionbody"> -<div class="para"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and +<div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and copied files. The <tt>--stat</tt> option adds diffstat(1) graph to the output. These options can be combined with other options, such as <tt>-p</tt>, and are meant for human consumption.</p></div> -<div class="para"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output +<div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output formats the pathnames compactly by combining common prefix and suffix of the pathnames. For example, a change that moves <tt>arch/i386/Makefile</tt> to <tt>arch/x86/Makefile</tt> while modifying 4 lines will be shown like this:</p></div> @@ -1440,7 +1533,7 @@ <div class="content"> <pre><tt>arch/{i386 => x86}/Makefile | 4 +--</tt></pre> </div></div> -<div class="para"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed +<div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed for easier machine consumption. An entry in <tt>--numstat</tt> output looks like this:</p></div> <div class="listingblock"> @@ -1448,8 +1541,8 @@ <pre><tt>1 2 README 3 1 arch/{i386 => x86}/Makefile</tt></pre> </div></div> -<div class="para"><p>That is, from left to right:</p></div> -<div class="olist"><ol> +<div class="paragraph"><p>That is, from left to right:</p></div> +<div class="olist arabic"><ol class="arabic"> <li> <p> the number of added lines; @@ -1481,14 +1574,14 @@ </p> </li> </ol></div> -<div class="para"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div> +<div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>1 2 README NUL 3 1 NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</tt></pre> </div></div> -<div class="para"><p>That is:</p></div> -<div class="olist"><ol> +<div class="paragraph"><p>That is:</p></div> +<div class="olist arabic"><ol class="arabic"> <li> <p> the number of added lines; @@ -1535,7 +1628,7 @@ </p> </li> </ol></div> -<div class="para"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow +<div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead. After reading added and deleted lines, reading up to <tt>NUL</tt> would yield @@ -1543,20 +1636,20 @@ </div> <h2 id="_operating_modes">Operating Modes</h2> <div class="sectionbody"> -<div class="para"><p>You can choose whether you want to trust the index file entirely +<div class="paragraph"><p>You can choose whether you want to trust the index file entirely (using the <em>--cached</em> flag) or ask the diff logic to show any files -that don't match the stat state as being "tentatively changed". Both +that don’t match the stat state as being "tentatively changed". Both of these operations are very useful indeed.</p></div> </div> <h2 id="_cached_mode">Cached Mode</h2> <div class="sectionbody"> -<div class="para"><p>If <em>--cached</em> is specified, it allows you to ask:</p></div> +<div class="paragraph"><p>If <em>--cached</em> is specified, it allows you to ask:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>show me the differences between HEAD and the current index contents (the ones I'd write using 'git write-tree')</tt></pre> </div></div> -<div class="para"><p>For example, let's say that you have worked on your working directory, updated +<div class="paragraph"><p>For example, let’s say that you have worked on your working directory, updated some files in the index and are ready to commit. You want to see exactly <strong>what</strong> you are going to commit, without having to write a new tree object and compare it that way, and to do that, you just do</p></div> @@ -1564,9 +1657,9 @@ <div class="content"> <pre><tt>git diff-index --cached HEAD</tt></pre> </div></div> -<div class="para"><p>Example: let's say I had renamed <tt>commit.c</tt> to <tt>git-commit.c</tt>, and I had +<div class="paragraph"><p>Example: let’s say I had renamed <tt>commit.c</tt> to <tt>git-commit.c</tt>, and I had done an <tt>update-index</tt> to make that effective in the index file. -<tt>git diff-files</tt> wouldn't show anything at all, since the index file +<tt>git diff-files</tt> wouldn’t show anything at all, since the index file matches my working directory. But doing a <em>git diff-index</em> does:</p></div> <div class="literalblock"> <div class="content"> @@ -1574,31 +1667,31 @@ -100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c +100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c</tt></pre> </div></div> -<div class="para"><p>You can see easily that the above is a rename.</p></div> -<div class="para"><p>In fact, <tt>git diff-index --cached</tt> <strong>should</strong> always be entirely equivalent to +<div class="paragraph"><p>You can see easily that the above is a rename.</p></div> +<div class="paragraph"><p>In fact, <tt>git diff-index --cached</tt> <strong>should</strong> always be entirely equivalent to actually doing a <em>git write-tree</em> and comparing that. Except this one is much nicer for the case where you just want to check where you are.</p></div> -<div class="para"><p>So doing a <tt>git diff-index --cached</tt> is basically very useful when you are +<div class="paragraph"><p>So doing a <tt>git diff-index --cached</tt> is basically very useful when you are asking yourself "what have I already marked for being committed, and -what's the difference to a previous tree".</p></div> +what’s the difference to a previous tree".</p></div> </div> <h2 id="_non_cached_mode">Non-cached Mode</h2> <div class="sectionbody"> -<div class="para"><p>The "non-cached" mode takes a different approach, and is potentially -the more useful of the two in that what it does can't be emulated with -a <em>git write-tree</em> + <em>git diff-tree</em>. Thus that's the default mode. +<div class="paragraph"><p>The "non-cached" mode takes a different approach, and is potentially +the more useful of the two in that what it does can’t be emulated with +a <em>git write-tree</em> + <em>git diff-tree</em>. Thus that’s the default mode. The non-cached version asks the question:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>show me the differences between HEAD and the currently checked out tree - index contents _and_ files that aren't up-to-date</tt></pre> </div></div> -<div class="para"><p>which is obviously a very useful question too, since that tells you what +<div class="paragraph"><p>which is obviously a very useful question too, since that tells you what you <strong>could</strong> commit. Again, the output matches the <em>git diff-tree -r</em> output to a tee, but with a twist.</p></div> -<div class="para"><p>The twist is that if some file doesn't match the index, we don't have +<div class="paragraph"><p>The twist is that if some file doesn’t match the index, we don’t have a backing store thing for it, and we use the magic "all-zero" sha1 to -show that. So let's say that you have edited <tt>kernel/sched.c</tt>, but +show that. So let’s say that you have edited <tt>kernel/sched.c</tt>, but have not actually done a <em>git update-index</em> on it yet - there is no "object" associated with the new state, and you get:</p></div> <div class="literalblock"> @@ -1606,7 +1699,7 @@ <pre><tt>torvalds@ppc970:~/v2.6/linux> git diff-index HEAD *100644->100664 blob 7476bb......->000000...... kernel/sched.c</tt></pre> </div></div> -<div class="para"><p>i.e., it shows that the tree has changed, and that <tt>kernel/sched.c</tt> has is +<div class="paragraph"><p>i.e., it shows that the tree has changed, and that <tt>kernel/sched.c</tt> has is not up-to-date and may contain new stuff. The all-zero sha1 means that to get the real diff, you need to look at the object in the working directory directly rather than do an object-to-object diff.</p></div> @@ -1617,8 +1710,8 @@ </td> <td class="content">As with other commands of this type, <em>git diff-index</em> does not actually look at the contents of the file at all. So maybe -<tt>kernel/sched.c</tt> hasn't actually changed, and it's just that you -touched it. In either case, it's a note that you need to +<tt>kernel/sched.c</tt> hasn’t actually changed, and it’s just that you +touched it. In either case, it’s a note that you need to <em>git update-index</em> it to make the index be in sync.</td> </tr></table> </div> @@ -1637,19 +1730,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-10-27 06:08:18 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> 